MSVC cleanups.

diff --git a/bushnell.c b/bushnell.c
index de55ac18d30f43a9399156adc152988ff080cda7..a26d9e595cfa53418ba076299da9d1a5136a70b1 100644 (file)
--- a/bushnell.c
+++ b/bushnell.c
@@ -158,6 +158,9 @@ rd_deinit(void) {
 static void
 wr_init(const char *fname) {
   char *dot, *slash;
+  static char valid_chars [] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789"
+               ".-/\\~@#$%^&*()_+=<>"
+                "abcdefghijklmnopqrstuvwxyz";
 
   ofname = xstrdup(fname);
 
@@ -166,10 +169,6 @@ wr_init(const char *fname) {
   slash = strrchr(ofname, GB_PATHSEP);
   if (dot > slash) *dot = 0;
 
-  static char valid_chars [] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789"
-               ".-/\\~@#$%^&*()_+=<>"
-                "abcdefghijklmnopqrstuvwxyz";
-
   mkshort_handle = mkshort_new_handle();
   setshort_length(mkshort_handle, 19);
   setshort_goodchars(mkshort_handle, valid_chars);

diff --git a/bushnell_trl.c b/bushnell_trl.c
index 5f322e602a3c8e990ff7e008863a528eacde4952..744a26a7c6c139a69380c802a3090680c3499f96 100644 (file)
--- a/bushnell_trl.c
+++ b/bushnell_trl.c
@@ -108,12 +108,12 @@ bushnell_read(void) {
 
 static void
 bushnell_write_one(const waypoint *wpt) {
+  gbint32 lat = wpt->latitude  * 10000000.0;
+  gbint32 lon = wpt->longitude * 10000000.0;
   trkpt_count++;
   if (trkpt_count > 4502)
     fatal(MYNAME " too many trackpoints.  Max is 4502.");
 
-  gbint32 lat = wpt->latitude  * 10000000.0;
-  gbint32 lon = wpt->longitude * 10000000.0;
   gbfputint32(lat, file_out);
   gbfputint32(lon, file_out);
 }

diff --git a/gopal.c b/gopal.c
index 01b2151ca3d0ce3250c9eaa6cbcf29394f7b5d57..412b3de8f8d41d51bff9ff95f553e83b749d806b 100644 (file)
--- a/gopal.c
+++ b/gopal.c
@@ -179,9 +179,9 @@ gopal_read(void)
        waypoint *wpt, *lastwpt=NULL;
        double long_old,lat_old;
        char tbuffer[64];
+       struct tm tm2;
        long_old=0;lat_old=0;
        strftime(routename,sizeof(routename),"Tracklog %c",localtime(&tx));
-       struct tm tm2;
        
        route = route_head_alloc();
        route->rte_name=xstrdup(routename);

diff --git a/msvc/GPSBabel.vcproj b/msvc/GPSBabel.vcproj
index 69eb3157c4dbc579fa822fef2a87bd8cb4cd83ab..9f4e1e579f03d1ffbf0120e5ce59844f9c3b38da 100644 (file)
--- a/msvc/GPSBabel.vcproj
+++ b/msvc/GPSBabel.vcproj
@@ -61,10 +61,11 @@
                                ObjectFile=".\Release/"\r
                                ProgramDataBaseFileName=".\Release/"\r
                                WarningLevel="3"\r
-                               WarnAsError="true"\r
+                               WarnAsError="false"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
                                CompileAs="0"\r
+                               ErrorReporting="1"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -370,6 +371,16 @@
                                RelativePath="..\brauniger_iq.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\bushnell.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                       <File\r
+                               RelativePath="..\bushnell_trl.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
                        <File\r
                                RelativePath="..\cet.c"\r
                                >\r
@@ -630,6 +641,10 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\enigma.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\exif.c"\r
                                >\r
@@ -1250,6 +1265,10 @@
                                RelativePath="..\itracku.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\jogmap.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\jtr.c"\r
                                >\r
@@ -1802,6 +1821,10 @@
                                RelativePath="..\pdbfile.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\pocketfms_wp.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\pocketfms_bc.c"\r
                                >\r
@@ -2170,6 +2193,10 @@
                                RelativePath="..\skyforce.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\skytraq.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\smplrout.c"\r
                                >\r
@@ -2266,6 +2293,10 @@
                                RelativePath="..\tef_xml.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\teletype.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\text.c"\r
                                >\r
@@ -2646,6 +2677,10 @@
                                RelativePath="..\wfff_xml.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\wintec_tes.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\xcsv.c"\r
                                >\r
@@ -3235,16 +3270,12 @@
                                RelativePath="..\defs.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\defs.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\filterdefs.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\garmin_device_xml.h.h"\r
+                               RelativePath="..\garmin_device_xml.h"\r
                                >\r
                        </File>\r
                        <File\r